combobox: some code cleanups

 * Merge adjacent if statements with the same condition
 * Add a space between a function and its declaration

diff --git a/gtk/gtkcombobox.c b/gtk/gtkcombobox.c
index f54a09f8ffd8236524fce19fd194349fbe6b6d06..471e419bb3167edd5c530970d863354f671b29ad 100644 (file)
--- a/gtk/gtkcombobox.c
+++ b/gtk/gtkcombobox.c
@@ -1794,10 +1794,7 @@ gtk_combo_box_unset_model (GtkComboBox *combo_box)
                                    priv->reordered_id);
       g_signal_handler_disconnect (priv->model,
                                    priv->changed_id);
-    }
 
-  if (priv->model)
-    {
       g_object_unref (priv->model);
       priv->model = NULL;
     }
@@ -3143,7 +3140,7 @@ gtk_combo_box_constructed (GObject *object)
 
 
 static void
-gtk_combo_box_dispose(GObject* object)
+gtk_combo_box_dispose (GObject* object)
 {
   GtkComboBox *combo_box = GTK_COMBO_BOX (object);
   GtkComboBoxPrivate *priv = combo_box->priv;